merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 8 Sep 2010 04:08:19 +0000 (13:08 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 8 Sep 2010 04:08:19 +0000 (13:08 +0900)
commit686c36c4f92adf51e1e4d2ca121493352b12ae3a
tree3a3bd95c3ce4ce09f8e355be72a9487f57ec8db4
parent096379bde8431e8c7d83b55a57eaee729f089a32
parentb3d458bb87bc81ea340840a7707b5d06b9196fd2
merge trunk